From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Sat, 1 May 2010 20:14:10 +0000 (-0700)
Subject: * sysdep.c (child_setup_tty, init_sys_modes): Remove !IBMR2AIX code, unused.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7937
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d48d5cfdbe485664a9f70f759ab53c4c3d4c3cb0;p=emacs.git

* sysdep.c (child_setup_tty, init_sys_modes): Remove !IBMR2AIX code, unused.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e99e6996812..fac87b92147 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-01  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* sysdep.c (child_setup_tty, init_sys_modes): Remove !IBMR2AIX code, unused.
+
 2010-05-01  Eli Zaretskii  <eliz@gnu.org>
 
 	Emulate POSIX_SIGNALS on MS-Windows.
diff --git a/src/sysdep.c b/src/sysdep.c
index 08c2bd48e59..7a9872e13c4 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -546,11 +546,6 @@ child_setup_tty (out)
 #endif /* not SIGNALS_VIA_CHARACTERS */
 
 #ifdef AIX
-/* AIX enhanced edit loses NULs, so disable it */
-#ifndef IBMR2AIX
-  s.main.c_line = 0;
-  s.main.c_iflag &= ~ASCEDIT;
-#endif
   /* Also, PTY overloads NUL and BREAK.
      don't ignore break, but don't signal either, so it looks like NUL.  */
   s.main.c_iflag &= ~IGNBRK;
@@ -1258,16 +1253,10 @@ init_sys_modes (tty_out)
 #endif /* mips or HAVE_TCATTR */
 
 #ifdef AIX
-#ifndef IBMR2AIX
-  /* AIX enhanced edit loses NULs, so disable it.  */
-  tty.main.c_line = 0;
-  tty.main.c_iflag &= ~ASCEDIT;
-#else
   tty.main.c_cc[VSTRT] = CDISABLE;
   tty.main.c_cc[VSTOP] = CDISABLE;
   tty.main.c_cc[VSUSP] = CDISABLE;
   tty.main.c_cc[VDSUSP] = CDISABLE;
-#endif /* IBMR2AIX */
   if (tty_out->flow_control)
     {
 #ifdef VSTART